Jacksonville Council to settle city contract fight with FOP