Fixing Git repo : conflit/+locked_win_fs_files