Signed-off-by: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Fix a few conflicts
Signed-off-by: kernelkind <kernelkind@gmail.com>