merged all conflicts

booo yeah mudafuckaaas!