fix build conflicts
Signed-off-by: Anonymous <kernelhackx@gmx.com>