conflict during merge