Two prongs: Council and City Hall housing plans are not in conflict