Los Angeles finally working at resolving conflicts between city building code and zoning codes