Today I learned (from this post) how to keep either file in a merge conflict. http://disq.us/t/7hz5c
QOTO: Question Others to Teach Ourselves An inclusive, Academic Freedom, instance All cultures welcome. Hate speech and harassment strictly forbidden.
