now compiles
merge fix