fixed the messed up conflict resolution