diff -Naur pwsafe-3.31Y-src-orig/src/ui/wxWidgets/passwordsafeframe.h pwsafe-3.31Y-src/src/ui/wxWidgets/passwordsafeframe.h
--- pwsafe-3.31Y-src-orig/src/ui/wxWidgets/passwordsafeframe.h	2013-06-19 19:49:31.000000000 +0200
+++ pwsafe-3.31Y-src/src/ui/wxWidgets/passwordsafeframe.h	2013-09-19 19:46:28.000000000 +0200
@@ -233,7 +233,7 @@
   void OnChangePasswdClick( wxCommandEvent& event );
 
   /// wxEVT_COMMAND_MENU_SELECTED event handler for ID_OPTIONS_M
-  void OnOptionsMClick( wxCommandEvent& event );
+  void OnPreferencesClick( wxCommandEvent& event );
 
   /// wxEVT_COMMAND_MENU_SELECTED event handler for ID_PWDPOLSM
   void OnPwdPolsMClick( wxCommandEvent& event );
diff -Naur pwsafe-3.31Y-src-orig/src/ui/wxWidgets/safecombinationentry.h pwsafe-3.31Y-src/src/ui/wxWidgets/safecombinationentry.h
--- pwsafe-3.31Y-src-orig/src/ui/wxWidgets/safecombinationentry.h	2013-06-19 19:49:31.000000000 +0200
+++ pwsafe-3.31Y-src/src/ui/wxWidgets/safecombinationentry.h	2013-09-19 19:18:22.000000000 +0200
@@ -70,6 +70,7 @@
   DECLARE_EVENT_TABLE()
 
 public:
+  StringX m_password;
   /// Constructors
   CSafeCombinationEntry(PWScore &core);
   CSafeCombinationEntry(wxWindow* parent, PWScore &core,
@@ -125,15 +126,9 @@
 ////@begin CSafeCombinationEntry member variables
   wxStaticText* m_version;
   wxComboBox* m_filenameCB;
-<<<<<<< .working
   CSafeCombinationCtrl* m_combinationEntry;
   wxBitmapButton* m_YubiBtn;
   wxStaticText* m_yubiStatusCtrl;
-=======
-  CSafeCombinationCtrl* m_combinationEntry;
-private:
-  StringX m_password;
->>>>>>> .merge-right.r5197
 ////@end CSafeCombinationEntry member variables
  private:
   wxString m_filename;
diff -Naur pwsafe-3.31Y-src-orig/src/ui/wxWidgets/version.in pwsafe-3.31Y-src/src/ui/wxWidgets/version.in
--- pwsafe-3.31Y-src-orig/src/ui/wxWidgets/version.in	2013-06-19 19:49:31.000000000 +0200
+++ pwsafe-3.31Y-src/src/ui/wxWidgets/version.in	2013-09-19 19:42:23.000000000 +0200
@@ -1,44 +1,44 @@
-/*
- * Copyright (c) 2003-2013 Rony Shapiro <ronys@users.sourceforge.net>.
- * All rights reserved. Use of the code is allowed under the
- * Artistic License 2.0 terms, as specified in the LICENSE file
- * distributed with this code, or available from
- * http://www.opensource.org/licenses/artistic-license-2.0.php
- */
-
-/** \file version.h
- * 
- */
-
-#ifndef _VERSION_H_
-#define _VERSION_H_
-
-#include <wx/string.h>
-
-#ifdef linux
-#define APPNAME _T("PasswordSafe (linux)")
-#else
-#define APPNAME _T("PasswordSafe (wxWidgets)")
-#endif
-
-#define MAJORVERSION 0
-#define MINORVERSION 91
-#define REVISION     0
-
-// LINUXPRODVER and VCS_VERSION set by mkversion.pl
-// LINUXPRODVER is for Misc/make-latest-xml.pl
-
-#define LINUXPRODVER MAJORVERSION, MINORVERSION, REVISION, VCS_VERSION
-#define VCS_VERSION "VERSTRING"
-
-// define following for custom/experimental versions
-#define SPECIALBUILD _T("beta")
-
-#ifndef SPECIALBUILD
-#define SPECIALBUILD _T("")
-#endif
-
-extern const wxString pwsafeAppName;
-extern const wxString pwsafeVersionString;
-
-#endif /* _VERSION_H_ */
+/*
+ * Copyright (c) 2003-2013 Rony Shapiro <ronys@users.sourceforge.net>.
+ * All rights reserved. Use of the code is allowed under the
+ * Artistic License 2.0 terms, as specified in the LICENSE file
+ * distributed with this code, or available from
+ * http://www.opensource.org/licenses/artistic-license-2.0.php
+ */
+
+/** \file version.h
+ * 
+ */
+
+#ifndef _VERSION_H_
+#define _VERSION_H_
+
+#include <wx/string.h>
+
+#ifdef linux
+#define APPNAME _T("PasswordSafe (linux)")
+#else
+#define APPNAME _T("PasswordSafe (wxWidgets)")
+#endif
+
+#define MAJORVERSION 0
+#define MINORVERSION 91
+#define REVISION     0
+#define VCS_VERSION  99
+
+// LINUXPRODVER and VCS_VERSION set by mkversion.pl
+// LINUXPRODVER is for Misc/make-latest-xml.pl
+
+#define LINUXPRODVER MAJORVERSION, MINORVERSION, REVISION, VCS_VERSION
+
+// define following for custom/experimental versions
+#define SPECIALBUILD _T("beta")
+
+#ifndef SPECIALBUILD
+#define SPECIALBUILD _T("")
+#endif
+
+extern const wxString pwsafeAppName;
+extern const wxString pwsafeVersionString;
+
+#endif /* _VERSION_H_ */