committing final uisettings changes before merege