added spanish language
conflicts fixed