Fixing up issues cause my my crappy merging software