2. commit before chery pick