Manually merge differences from master and update versions