Added config file
Fixed conflict