I have uncommitted changes?  Oops
Fixed conflicts... hopefully correctly