MErge changes