4.1.17: Maintenance Release
What's Changed Verify resolveMerge is called for valid files pending conflict resolution by @knolleary in #5998 Fix merge conflict resolution bug by @knolleary in #5999 Bump for 4.1.17 by @knolleary in #6029 Full Changelog: 4.1.16...4.1.17