Resyncing branches

Making sure both branches are updated after tree problems.