Conflict fixes (1905)