remove unused HTML entities
fix pull merge conflict