Resolved merged conflicts