Primary Industries Minister Teresa Kok told the press on Thursday that the Government is working to resolve the spat, which has escalated to Indian traders calling for a boycott to its locally produced palm oil.