merging - resolving conflicts