cleaned up SO MUCH
fixed merge conflicts