merge-conflict-resolver — skill by Moliboy5000 | Shared Context