removed some tags from merge