Resolved conflicts

Author: erikras

README.md

@@ -504,9 +504,9 @@ to apply to the form.
 
 [See the 🏁 Final Form docs on `mutators`](https://github.com/final-form/final-form#mutators--string-function-).
 
-#### `onSubmit: (values: Object, callback: ?(errors: ?Object) => void) => ?Object | Promise<?Object> | void`
+#### `onSubmit: (values: Object, form: FormApi, callback: ?(errors: ?Object) => void) => ?Object | Promise<?Object> | void`
 
-[See the 🏁 Final Form docs on `onSubmit`](https://github.com/final-form/final-form#onsubmit-values-object-callback-errors-object--void--object--promiseobject--void).
+[See the 🏁 Final Form docs on `onSubmit`](https://github.com/final-form/final-form#onsubmit-values-object-form-formapi-callback-errors-object--void--object--promiseobject--void).
 
 #### `render?: (props: FormRenderProps) => React.Node`
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-final-form",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "description":
     "🏁 High performance subscription-based form state management for React",
   "main": "dist/react-final-form.cjs.js",
@@ -42,7 +42,7 @@
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.4.0",
-    "final-form": "^2.0.0",
+    "final-form": "^3.0.0",
     "flow": "^0.2.3",
     "flow-bin": "^0.61.0",
     "husky": "^0.14.3",
@@ -65,7 +65,7 @@
     "rollup-plugin-uglify": "^2.0.1"
   },
   "peerDependencies": {
-    "final-form": "^2.0.0",
+    "final-form": "^3.0.0",
     "prop-types": "^15.6.0",
     "react": "^15.3.0 || ^16.0.0-0"
   },

src/ReactFinalForm.js

@@ -17,7 +17,7 @@ import type {
 import type { FormProps as Props, ReactContext } from './types'
 import shallowEqual from './shallowEqual'
 import renderComponent from './renderComponent'
-export const version = '1.2.1'
+export const version = '2.0.0'
 
 export const all: FormSubscription = formSubscriptionItems.reduce(
   (result, key) => {