before second merge