resolving merging problems