New GitHub App automates resolving merge conflicts (JavaScript only)blogs.grammatech.com·4 pts·eschulte·1