diff --git a/.gitignore b/.gitignore
index 5ff6309..b74481f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,2 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store
\ No newline at end of file
+/target
+/.idea/
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7e21b1e..78ba9fe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,20 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="39ae3b4d-1f76-4ebd-97d3-1fc9148ce3b6" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/example/Contact.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/example/Friend.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/example/Main.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/example/Smartphone.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/example/positionable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/example/startAndstoppable.java" afterDir="false" />
-    </list>
+    <list default="true" id="39ae3b4d-1f76-4ebd-97d3-1fc9148ce3b6" name="Changes" comment="Final Merge Test" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -32,6 +19,11 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="featureAB" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="MarkdownSettingsMigration">
@@ -50,19 +42,19 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager">
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.Main" />
@@ -80,6 +72,7 @@
     <recent_temporary>
       <list>
         <item itemvalue="Application.Main" />
+        <item itemvalue="Application.Main" />
       </list>
     </recent_temporary>
   </component>
@@ -93,9 +86,40 @@
       <updated>1678289786309</updated>
       <workItem from="1678289788030" duration="8979000" />
     </task>
+    <task id="LOCAL-00001" summary="Final Merge Test">
+      <created>1678360452667</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1678360452667</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Final Merge Test">
+      <created>1678360668988</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1678360668988</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Final Aufgabe" />
+    <MESSAGE value="Final Merge Test" />
+    <option name="LAST_COMMIT_MESSAGE" value="Final Merge Test" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/org/example/Smartphone.java b/src/main/java/org/example/Smartphone.java
index e1cb8f1..550933d 100644
--- a/src/main/java/org/example/Smartphone.java
+++ b/src/main/java/org/example/Smartphone.java
@@ -45,6 +45,10 @@ public void setContactList(ArrayList<Contact> contactList) {
         this.contactList = contactList;
     }
 
+    public boolean containsAtLeast3Contacts() {
+    return contact.size () <= 3;
+    }
+
     @Override
     public boolean startRadio() {
         System.out.println("Radio started");
diff --git a/target/classes/org/example/Contact.class b/target/classes/org/example/Contact.class
new file mode 100644
index 0000000..339f088
Binary files /dev/null and b/target/classes/org/example/Contact.class differ
diff --git a/target/classes/org/example/Friend.class b/target/classes/org/example/Friend.class
new file mode 100644
index 0000000..e7f7841
Binary files /dev/null and b/target/classes/org/example/Friend.class differ
diff --git a/target/classes/org/example/Main.class b/target/classes/org/example/Main.class
new file mode 100644
index 0000000..4f5cbcb
Binary files /dev/null and b/target/classes/org/example/Main.class differ
diff --git a/target/classes/org/example/Smartphone.class b/target/classes/org/example/Smartphone.class
new file mode 100644
index 0000000..81ef228
Binary files /dev/null and b/target/classes/org/example/Smartphone.class differ
diff --git a/target/classes/org/example/positionable.class b/target/classes/org/example/positionable.class
new file mode 100644
index 0000000..0c2a434
Binary files /dev/null and b/target/classes/org/example/positionable.class differ
diff --git a/target/classes/org/example/startAndstoppable.class b/target/classes/org/example/startAndstoppable.class
new file mode 100644
index 0000000..34027a0
Binary files /dev/null and b/target/classes/org/example/startAndstoppable.class differ