add another merge before second commit