Resolved conflict