fixed merge conflicts THANKS ALOT GUYS