Solving github conflicts

This upload should have solved all of the conflicts, I have only
uploaded from the single computer today so I am unsure how these
conflicts could have arisen, but they should be solved now.