removed merge conflict