added code to find conflicting files created when doing git pull.