Added shell script to find conflict files
renamed find_conflicts
renamed find_conflicts.sh