second merge and changed git