Resolve conflict in Kbuild.include