Add ConflictHandler to handle conflict in renaming process