commit before checkout
Merge remote-tracking branch 'origin_bb/master'