Conflict resolution on aa ridiculous merge