Removed bad merge tags