fix - merge