Resolved conflicts before merge