add a non-conflicting line in git Thu Dec 12 10:04:50 PST 2013