Fix merge errors causing broken build.