new branch develop
add group and post
fix confict