Bump version to 5.1.0, as we have made some major changes to the way conflict resolution works.