fixing conflict after merging
[findit] / src /
drwxr-xr-x   ..
-rwxr-xr-x 15286 findit.py