added new branch hhq
deal the conflict
deal the conflict and update the framework