diff --git a/TestMe/TestMe.xcodeproj/project.xcworkspace/xcuserdata/ericschramm.xcuserdatad/UserInterfaceState.xcuserstate b/TestMe/TestMe.xcodeproj/project.xcworkspace/xcuserdata/ericschramm.xcuserdatad/UserInterfaceState.xcuserstate
index ea9b913..200f32a 100644
Binary files a/TestMe/TestMe.xcodeproj/project.xcworkspace/xcuserdata/ericschramm.xcuserdatad/UserInterfaceState.xcuserstate and b/TestMe/TestMe.xcodeproj/project.xcworkspace/xcuserdata/ericschramm.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/TestMe/TestMe/AppDelegate.swift b/TestMe/TestMe/AppDelegate.swift
index a4dff49..5444add 100644
--- a/TestMe/TestMe/AppDelegate.swift
+++ b/TestMe/TestMe/AppDelegate.swift
@@ -18,7 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Override point for customization after application launch.
         let emily = "Emily"
         print(emily)
-        let merge = "let's make a merge conflict here."
+        let merge = "let's make a merge conflict NOT here."
         return true
     }