add feature for restore previous option settings
resolve merge conflict