i changed so much shit

you dont even know
fixing merge error