Issues fixed with conflicts in submodules

PatchProccessor support combined diff's