make category alias
fix merge conflicts