Resolve conflicts

Author: collijk

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/collijk/python-package-cookiecutter",
-  "commit": "45f4b1f9471d442bebcfcbc67c53bc3488de2beb",
+  "commit": "6a159105838fc80cba178d2fbcc6185fd3ef8df2",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -12,7 +12,7 @@
       "package_name": "rra_tools",
       "project_short_description": "Common utilities for IHME Rapid Response team pipelines.",
       "_template": "https://github.com/collijk/python-package-cookiecutter",
-      "_commit": "45f4b1f9471d442bebcfcbc67c53bc3488de2beb"
+      "_commit": "6a159105838fc80cba178d2fbcc6185fd3ef8df2"
     }
   },
   "directory": null