President Cyril Ramaphosa has reaffirmed government's commitment to resolving the tense situation at Stilfontein in the North West, through peaceful and safe measures.