began work on merge