fixed stupid merge

I think... more fixes may be coming