Resolved conflict names