Compile/merge fix