Updated make.sh to be a bit more generic
merge resolution.