Resolved conflict committed in error