merge carrot, trader fix