OK, that didn't work
Losing all of my changes for conflict resolution