Merger fix