Fix Linux 3.4.6 Merge Conflicts