Updating with most recent changes before branching