progress on progress
fixed merge results