Repaired strange conflicts
1/7  mid of Structure Improving ..