closed opened tags, fixed manual merge bugs