Remove conflicts in Index.Remove

We never got around to dealing with conflicts properly in #398.  We should do that.