City settles Brickfire grant dispute with state agency