Merge Conflict Resolution. May require further tests