Fix production conflicts automatically (and more sync tweaks) #390
+472
−64
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.