PR with conflicts that can be resolved with resolve-conflicts
#82
+1
−0
resolve-conflicts
#82