removed merge conflict line