Updated shell script
Merge conf