@sgithens Merge conflicts in life usually are less of a problem than in source code.

10:09am October 7th 2011 via web in reply to sgithens