remove unused permission
remove space'
fix conflict