City-Mabolo Block 27 dispute settled