update some information
fix merge conflict
add available real content