merge progress model branch