merge with v5