fixing a merge conflict SAM MUTHA FUCKIN JACKSON