add categories index
fix merge conflict