fixed allllllll the bugs
fixed merge conflicts