trying to merge files so that I can revert and bugtest properly, all hell seems to have broken loose on my git...