merg fix