Resolved merged conflict