Solved merge conflicts (just removed commented shit.)