Resolved conflict methods