Rename File: ConflictResolver.php

File Manager