Added BBEdit Settings
Got rid of git module conflict
Troubleshooting module conflict...
Troubleshooting...