add a non-conflicting line in git