adds notes on cherry picking commits