Fixed all conflicts and shit.