Super merge test