Removes the merge conflict remains

Status Job ID Name Coverage
  Test
passed #1666
development
job1

00:00:00