merge adjust branch