working on merge tags