GIT: conflict quick, conflict cheap - Call Of Dev