Fixed all errors in the project
Renamed config
Fixed merge conflict