create new conflict
fixing conflict