resolving merging conflicts