1. fix the branch bug