mmerging changes