Removed merge conflict line