Colombia’s govt strikes deal with miners and indigenous to end strike