revert to merge properly.