made a conflict
resolved conflict