fix-merge-conflicts, Changelog

Compare any two versions of this skill before upgrading. 1 version published.

Only one version has been published, no diffs to show yet.