cant wait for the best merge conflict ever

<img src="http://media.heavy.com/media/2013/06/m4.gif">