Remove merge conflict leftovers

5 jobs for 192-semantic-html
in 8 minutes and 10 seconds and was queued for 1 second