Fixed a bunch of conflicts in git confusing actual progress...