Merge with updated version