Merging branches - let's get settings updated.