fixed the collisions

Everything should be good after manually merging the code