Update of the merged proposal
Update of the project CS requirements
fixed the project version and merge conflict
Fixe the CS fixer issues
Update of the unit tests