add a non-conflicting line in git Thu Dec 12 16:28:59 PST 2013