Water under the bridge? ERB officials hope spat with city over new building could soon be resolved