The City Council, city attorney, state representatives and the mayor’s office figured out a way to temporarily end a conflict between state and local law that threatened to close the tap to hundreds of millions of dollars in state money for local construction projects.