fixes a conflict, and enables help