formatting and performance improvements
v7.55 improvements around conflicts resolution, see change log