Added conflict file creation algorithm to fs factory
Merge branch 'develop' of github.com:OpenDataSpace/CmisSync into develop