Bug 913807 - Fix up merge conflicts