Fix Linux update merge errors