Compilation fix : 2 files had merge instructions left, after checking patch i corrected the files.