fixed a merge conflict and removed unnecessary debug statement