ammend merge: now compiles