Resolved conflicts after merge