Resolved conflicts for merge