I pushed merge conflicts...

PixiEditor/Models/UserPreferences/PreferencesSettings.cs

@@ -122,22 +122,14 @@ namespace PixiEditor.Models.UserPreferences
             try
             {
                 return Preferences.ContainsKey(name)
-<<<<<<< HEAD
                         ? (T)Convert.ChangeType(Preferences[name], typeof(T))
                         : fallbackValue;
             }
             catch (InvalidCastException)
             {
-=======
-                    ? (T)Preferences[name]
-                    : fallbackValue;
-            }
-            catch (InvalidCastException)
-            {
                 Preferences.Remove(name);
                 Save();
 
->>>>>>> ab87ace (Fixed crashes when user edits preference file)
                 return fallbackValue;
             }
         }
@@ -157,21 +149,14 @@ namespace PixiEditor.Models.UserPreferences
             try
             {
                 return LocalPreferences.ContainsKey(name)
-<<<<<<< HEAD
                     ? (T)Convert.ChangeType(LocalPreferences[name], typeof(T))
-=======
-                    ? (T)LocalPreferences[name]
->>>>>>> ab87ace (Fixed crashes when user edits preference file)
                     : fallbackValue;
             }
             catch (InvalidCastException)
             {
-<<<<<<< HEAD
-=======
                 LocalPreferences.Remove(name);
                 Save();
 
->>>>>>> ab87ace (Fixed crashes when user edits preference file)
                 return fallbackValue;
             }
         }