fix conflict issues, re #8912