conflicts redux
immutable Conflicts