Sometimes, sexiness requires merge conflicts