changes in second merge step