Added troubleshooting
added permission
merge