Pheww Fucking merge conficts, Killed them all