Revert "clearing out git conflict cruft"

This reverts commit 9f714566b1cb0e643204b7d751c24ed1bd41f2d7.