Guilty pleasure: I get a little excited every time I get a merge conflict. It’s a like a fun little puzzle I need to solve! 2013/06/13