Started with the file Manager, add grid row edit functionalities.
Resolve merge conflicts
~
~