merge part6