work on merge