Fucking merge... Fixed it all