removed merge tags