ConflictData minor refactoring