Fixed it
Merged funny stuff