modify file category
fix conflict
add image into pro
fix conflict