Don't attempt conflict resolution, let reloading handle it