diff --git a/components/settings/about.js b/components/settings/about.js
index 9ea0ea1..9e33402 100644
--- a/components/settings/about.js
+++ b/components/settings/about.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import { ScrollView } from 'react-native'
 import Hyperlink from 'react-native-hyperlink'
 import AppText from '../app-text'
-import SettingsSegment from './common/settings-segment'
+import SettingsSegment from './shared/settings-segment'
 import styles from '../../styles/index'
 import labels, { links } from '../../i18n/en/settings'
 import replace from '../helpers/replace-url-with-text'
diff --git a/components/settings/data-management/delete-data.js b/components/settings/data-management/delete-data.js
index 36af3ef..581c881 100644
--- a/components/settings/data-management/delete-data.js
+++ b/components/settings/data-management/delete-data.js
@@ -4,9 +4,9 @@ import { Alert, ToastAndroid } from 'react-native'
 
 import { clearDb, isDbEmpty } from '../../../db'
 import { hasEncryptionObservable } from '../../../local-storage'
-import SettingsButton from '../common/settings-button'
-import ConfirmWithPassword from '../common/confirm-with-password'
-import alertError from '../common/alert-error'
+import SettingsButton from '../shared/settings-button'
+import ConfirmWithPassword from '../shared/confirm-with-password'
+import alertError from '../shared/alert-error'
 
 import settings from '../../../i18n/en/settings'
 import { shared as sharedLabels } from '../../../i18n/en/labels'
diff --git a/components/settings/data-management/export-dialog.js b/components/settings/data-management/export-dialog.js
index 8200b68..4b47c2c 100644
--- a/components/settings/data-management/export-dialog.js
+++ b/components/settings/data-management/export-dialog.js
@@ -2,7 +2,7 @@ import Share from 'react-native-share'
 
 import { getCycleDaysSortedByDate } from '../../../db'
 import getDataAsCsvDataUri from '../../../lib/import-export/export-to-csv'
-import alertError from '../common/alert-error'
+import alertError from '../shared/alert-error'
 import settings from '../../../i18n/en/settings'
 import { EXPORT_FILE_NAME } from './constants'
 import RNFS from 'react-native-fs'
diff --git a/components/settings/data-management/import-dialog.js b/components/settings/data-management/import-dialog.js
index e35204e..5971c4b 100644
--- a/components/settings/data-management/import-dialog.js
+++ b/components/settings/data-management/import-dialog.js
@@ -4,7 +4,7 @@ import rnfs from 'react-native-fs'
 import importCsv from '../../../lib/import-export/import-from-csv'
 import { shared as sharedLabels } from '../../../i18n/en/labels'
 import labels from '../../../i18n/en/settings'
-import alertError from '../common/alert-error'
+import alertError from '../shared/alert-error'
 
 export default function openImportDialogAndImport() {
   Alert.alert(
diff --git a/components/settings/data-management/index.js b/components/settings/data-management/index.js
index 1480aeb..43b4f48 100644
--- a/components/settings/data-management/index.js
+++ b/components/settings/data-management/index.js
@@ -1,8 +1,8 @@
 import React from 'react'
 import { ScrollView } from 'react-native'
 import AppText from '../../app-text'
-import SettingsSegment from '../common/settings-segment'
-import SettingsButton from '../common/settings-button'
+import SettingsSegment from '../shared/settings-segment'
+import SettingsButton from '../shared/settings-button'
 import openImportDialogAndImport from './import-dialog'
 import openShareDialogAndExport from './export-dialog'
 import DeleteData from './delete-data'
@@ -25,7 +25,7 @@ const DataManagement = () => {
       </SettingsSegment>
       <SettingsSegment
         title={labels.deleteSegment.title}
-        last={true}
+        last
       >
         <AppText>{labels.deleteSegment.explainer}</AppText>
         <DeleteData />
diff --git a/components/settings/nfp-settings/index.js b/components/settings/nfp-settings/index.js
index 98b27e0..a95c5de 100644
--- a/components/settings/nfp-settings/index.js
+++ b/components/settings/nfp-settings/index.js
@@ -6,7 +6,7 @@ import Hyperlink from 'react-native-hyperlink'
 import styles, { iconStyles } from '../../../styles'
 import labels from '../../../i18n/en/settings'
 import AppText from '../../app-text'
-import SettingsSegment from '../common/settings-segment'
+import SettingsSegment from '../shared/settings-segment'
 import TempSlider from './temp-slider'
 import UseCervixSetting from './use-cervix'
 import Icon from 'react-native-vector-icons/Entypo'
diff --git a/components/settings/nfp-settings/temp-slider.js b/components/settings/nfp-settings/temp-slider.js
index 822a092..ecccaf4 100644
--- a/components/settings/nfp-settings/temp-slider.js
+++ b/components/settings/nfp-settings/temp-slider.js
@@ -9,7 +9,7 @@ import {
 import { secondaryColor } from '../../../styles/index'
 import labels from '../../../i18n/en/settings'
 import config from '../../../config'
-import alertError from '../common/alert-error'
+import alertError from '../shared/alert-error'
 
 export default class TempSlider extends Component {
   constructor(props) {
diff --git a/components/settings/password/create.js b/components/settings/password/create.js
index 44b08a0..aaa021d 100644
--- a/components/settings/password/create.js
+++ b/components/settings/password/create.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import { View } from 'react-native'
 import settings from '../../../i18n/en/settings'
 import EnterNewPassword from './enter-new-password'
-import SettingsButton from '../common/settings-button'
+import SettingsButton from '../shared/settings-button'
 import showBackUpReminder from './show-backup-reminder'
 
 export default class CreatePassword extends Component {
diff --git a/components/settings/password/delete.js b/components/settings/password/delete.js
index 3792a04..b6435a0 100644
--- a/components/settings/password/delete.js
+++ b/components/settings/password/delete.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react'
 import labels from '../../../i18n/en/settings'
 import { changeEncryptionAndRestartApp } from '../../../db'
-import ConfirmWithPassword from '../common/confirm-with-password'
-import SettingsButton from '../common/settings-button'
+import ConfirmWithPassword from '../shared/confirm-with-password'
+import SettingsButton from '../shared/settings-button'
 
 export default class DeletePassword extends Component {
   constructor() {
diff --git a/components/settings/password/enter-new-password.js b/components/settings/password/enter-new-password.js
index 2b0faa1..cba3a11 100644
--- a/components/settings/password/enter-new-password.js
+++ b/components/settings/password/enter-new-password.js
@@ -4,8 +4,8 @@ import nodejs from 'nodejs-mobile-react-native'
 
 import { requestHash, changeEncryptionAndRestartApp } from '../../../db'
 import AppText from '../../app-text'
-import PasswordField from '../common/password-field'
-import SettingsButton from '../common/settings-button'
+import PasswordField from '../shared/password-field'
+import SettingsButton from '../shared/settings-button'
 
 import styles from '../../../styles'
 import settings from '../../../i18n/en/settings'
diff --git a/components/settings/password/index.js b/components/settings/password/index.js
index 50e9f88..d9caf4b 100644
--- a/components/settings/password/index.js
+++ b/components/settings/password/index.js
@@ -3,7 +3,7 @@ import { ScrollView } from 'react-native'
 import CreatePassword from './create'
 import ChangePassword from './update'
 import DeletePassword from './delete'
-import SettingsSegment from '../common/settings-segment'
+import SettingsSegment from '../shared/settings-segment'
 import AppText from '../../app-text'
 import {
   hasEncryptionObservable
diff --git a/components/settings/password/update.js b/components/settings/password/update.js
index 2dfc15f..e09433a 100644
--- a/components/settings/password/update.js
+++ b/components/settings/password/update.js
@@ -1,9 +1,9 @@
 import React, { Component } from 'react'
 import settings from '../../../i18n/en/settings'
 import EnterNewPassword from './enter-new-password'
-import SettingsButton from '../common/settings-button'
+import SettingsButton from '../shared/settings-button'
 import showBackUpReminder from './show-backup-reminder'
-import ConfirmWithPassword from '../common/confirm-with-password'
+import ConfirmWithPassword from '../shared/confirm-with-password'
 
 
 export default class ChangePassword extends Component {
diff --git a/components/settings/reminders/index.js b/components/settings/reminders/index.js
index 62ca7b8..92fc461 100644
--- a/components/settings/reminders/index.js
+++ b/components/settings/reminders/index.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import {
   ScrollView,
 } from 'react-native'
-import SettingsSegment from '../common/settings-segment'
+import SettingsSegment from '../shared/settings-segment'
 import TempReminderPicker from './temp-reminder-picker'
 import PeriodReminderPicker from './period-reminder'
 
diff --git a/components/settings/common/alert-error.js b/components/settings/shared/alert-error.js
similarity index 100%
rename from components/settings/common/alert-error.js
rename to components/settings/shared/alert-error.js
diff --git a/components/settings/common/confirm-with-password.js b/components/settings/shared/confirm-with-password.js
similarity index 97%
rename from components/settings/common/confirm-with-password.js
rename to components/settings/shared/confirm-with-password.js
index e7a48ee..bacef7c 100644
--- a/components/settings/common/confirm-with-password.js
+++ b/components/settings/shared/confirm-with-password.js
@@ -5,7 +5,7 @@ import nodejs from 'nodejs-mobile-react-native'
 import { requestHash, openDb } from '../../../db'
 
 import PasswordField from './password-field'
-import SettingsButton from '../common/settings-button'
+import SettingsButton from '../shared/settings-button'
 
 import settings from '../../../i18n/en/settings'
 import { shared } from '../../../i18n/en/labels'
diff --git a/components/settings/common/password-field.js b/components/settings/shared/password-field.js
similarity index 100%
rename from components/settings/common/password-field.js
rename to components/settings/shared/password-field.js
diff --git a/components/settings/common/settings-button.js b/components/settings/shared/settings-button.js
similarity index 100%
rename from components/settings/common/settings-button.js
rename to components/settings/shared/settings-button.js
diff --git a/components/settings/common/settings-segment.js b/components/settings/shared/settings-segment.js
similarity index 76%
rename from components/settings/common/settings-segment.js
rename to components/settings/shared/settings-segment.js
index e33fd13..8d73a77 100644
--- a/components/settings/common/settings-segment.js
+++ b/components/settings/shared/settings-segment.js
@@ -9,16 +9,11 @@ const SettingsSegment = ({ children, ...props }) => {
   const style = [styles.settingsSegment, props.style]
   if (props.last) style.push(styles.settingsSegmentLast)
   return (
-<<<<<<< HEAD
-    <View style={style}>
-      <AppText style={styles.settingsSegmentTitle}>{props.title}</AppText>
-=======
     <View style={[styles.settingsSegment, props.style]}>
       {
         props.title
         && <AppText style={styles.settingsSegmentTitle}>{props.title}</AppText>
       }
->>>>>>> Refactor npf settings component
       {children}
     </View>
   )