diff --git a/apps/skolplattformen-sthlm/components/__tests__/Absence.test.js b/apps/skolplattformen-sthlm/components/__tests__/Absence.test.js
index 076d803e6..b0fb65ae5 100644
--- a/apps/skolplattformen-sthlm/components/__tests__/Absence.test.js
+++ b/apps/skolplattformen-sthlm/components/__tests__/Absence.test.js
@@ -44,7 +44,7 @@ beforeEach(async () => {
   await AsyncStorage.clear()
 })
 
-test.skip('can fill out the form with full day absence', async () => {
+test('can fill out the form with full day absence', async () => {
   const screen = setup()
 
   await waitFor(() =>
@@ -61,7 +61,7 @@ test.skip('can fill out the form with full day absence', async () => {
   expect(sendSMS).toHaveBeenCalledWith('121212-1212')
 })
 
-test.skip('handles missing social security number', async () => {
+test('handles missing social security number', async () => {
   const screen = setup()
 
   await waitFor(() => fireEvent.press(screen.getByText('Skicka')))
@@ -70,7 +70,7 @@ test.skip('handles missing social security number', async () => {
   expect(sendSMS).not.toHaveBeenCalled()
 })
 
-test.skip('validates social security number', async () => {
+test('validates social security number', async () => {
   const screen = setup()
 
   await waitFor(() =>
diff --git a/apps/skolplattformen-sthlm/package.json b/apps/skolplattformen-sthlm/package.json
index 45aeaca4d..fb0ad2d7a 100644
--- a/apps/skolplattformen-sthlm/package.json
+++ b/apps/skolplattformen-sthlm/package.json
@@ -68,46 +68,14 @@
     "react-native-svg": "*",
     "react-native-typography": "*",
     "react-native-webview": "*",
-<<<<<<< HEAD
-    "formik": "*",
-    "moment": "*",
-    "personnummer": "*",
-    "yup": "*",
-    "@testing-library/react-hooks": "*",
-    "valtio": "*",
-    "i18n-js": "*",
-    "deepmerge": "*",
-    "buffer": "*",
-    "fast-fuzzy": "*",
-    "luxon": "*",
-    "node-fetch": "*",
-    "tough-cookie": "*",
-    "fetch-cookie": "*",
-    "https-proxy-agent": "*",
-    "events": "*",
-    "he": "*",
-    "node-html-parser": "*",
-    "change-case": "*",
-    "node-blob": "*",
-    "camelcase-keys": "*",
-    "h2m": "*",
-    "js-htmlencode": "*",
-    "regenerator-runtime": "*",
-=======
     "react-native": "*",
->>>>>>> 1ef5dd58bcec89cb16249459d30502a5b8a14681
     "react-redux": "*",
     "react": "*",
     "redux": "*",
-<<<<<<< HEAD
-    "@testing-library/react": "*",
-    "@react-native-cookies/cookies": "*"
-=======
     "regenerator-runtime": "*",
     "tough-cookie": "*",
     "valtio": "*",
     "yup": "*"
->>>>>>> 1ef5dd58bcec89cb16249459d30502a5b8a14681
   },
   "devDependencies": {},
   "private": true