* Solved conflict
* Prevent missing config error