#!/bin/bash
# A script that removes or replaces strings for all files in a directory
# Be sure to modify "conflict-" with what you want
# This script just removes leading "conflict-" string
for iFile in `ls`
do
   newFile=`echo $iFile | sed s/conflict\-//`
#   newFile=`basename $iFile -txt`
   mv $iFile $newFile
done