correction on merge