Refactored config into config.yml
Fixed conflicts