refactoring ConflictsController