merge part from branch