removed merge conflict marker