Remove merge conflict leftovers

5 jobs for 192-semantic-html in 8 minutes and 10 seconds (queued for 1 second)
Status Job ID Name Coverage
  Codestyle
passed #170975
nodejs
tslint

00:01:39

 
  Test
passed #170976
nodejs
unit_tests

00:01:45

 
  Build
passed #170977
angular
ngbuild

00:04:42

 
  Review
passed #170978
nginx
review

00:00:01

passed #170979
nginx allowed to fail manual
stop_review

00:00:01