fix conflicts and add missing closing tag