More Linux merge errors