Lonmin strike ending, tensions remain