add a non-conflicting line in git Thu Dec 12 09:47:00 PST 2013