testing merging with conflict