Resolved Merged Conflifts