Fix Linux 3.4.7 Merge Conflicts