Don't allow conflicts by default

Now that #2453 is merged, we don't have to work around the fact that we're checking out an index with conflicts, it will do the right thing for us.  Drop the `ALLOW_CONFLICTS` flag, it is unnecessary.