Removed more merge tags