commiting before rebasing with ryan 1.5