Enjoy resolving the merge conflicts by hand.