fix test branch merge