since 4 out of 6 files have conflicts and some changes are marked "not required" or "already taken care of" by @bencoman, I'd say, starting over is easier?

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.