Fix conflicting categories hopefully