add a non-conflicting line in git Fri Dec 13 08:58:45 PST 2013