fix Linux 3.3.81 merge conflicts