Correcting mistakes on merge