The long-awaited merger between commodity giants Glencore and Xstrata could finally go ahead after proposals were revised.