Fix patch conflict
Add wip to disable SELinux