merge latest two branches