merge with recent version