prepare for conflict
resolved conflict