It's finally over: Fitbit and Jawbone agree to make up and move on