cant wait for the best merge conflict ever

<img src="http://www.reactiongifs.com/wp-content/uploads/2013/10/good-luck.gif">