Updating branches to be on same commit