removing  merge conflict line