Update on merge