Attempting to fix merge issues again
fixed all the diseases and git errors