merge has now been completed