Fixing more broken aspects of my dodgy conflict resolution (-_-)