
* changes: Fix the MERGE_CONFLICT name in ChangeStates Replace "the the" occurences with "the" (wrong repetition) Merge branch 'stable-2.15'
* changes: Fix the MERGE_CONFLICT name in ChangeStates Replace "the the" occurences with "the" (wrong repetition) Merge branch 'stable-2.15'