As lawmakers prepare for the upcoming session, they claim last summer's strife with the governor is water under the bridge.