resolved conflicts for merging