Apparently Xcode's merge doesn't like it when you put in your own code.