modify
fix conflict
add blog dir