This maybe a bad commit

-Fixed conflicts, lets see what happens