Warning message
Remove conf
merge