remove merge conflict that was still there.