Removed previously incorrect merge tags