add BranchPeer class part
fix conflict and modify the connection part