Remove log from config file
Merge conflict resolve