Fixing Github mess

Sorry for all this. GitHub is screwing with the differences by marking
<<<<<HEAD and random numbers within the code itself around the changes I
make