reenable merge tags