avoiding future conflicts in git