fixing conflict resolution errors