Small update on merge