change back to merge