Resolved conflict x2