Fix Linux 3.4.2 Merge Conflicts