MErge fix