Deleted conflicting submodules
Deleted braces plugin submodule
Readded plugins ("dirty" added in .gitmodules)