Fixed merge conflicts
Removed fr.yml locale
Removed unwanted spec