resolving merges