remove this merge conflict line and the one below it.