Abandoned changes made in order to handle merge conflicts, they'll just have to be done manually whenever they occur which should be rarely.