latest merge with will