big modifications :
1) merge two seperate files (conflict.sh & dryrun.sh) into one file (dryrun.sh)
2) add several separate functions