Removed strange merge tags...