Rename File: conflicts.py

File Manager