resolved conflicts in merging