made merging script more interactive
Merge branch 'master' of https://github.com/BaobabHealthTrust/bart2