Fixed conflict
Removed config file
Updated gitignore with config
Merge branch 'development'