Issue on merge