change diff to merge