expected gix merge
