removed missing merge conflict marker