Fixed broken merge so that it compiles again.