Resolved conflicts for merging