That was a bad conflict resolution...