resolve trade conflicts

English-Turkish translations from the Atalay Dictionary, First Edition