pass first diff merge test