fix - custom merge logic