diff --git a/js/scenes/NumberOfGuestScreen/styles.js b/js/scenes/NumberOfGuestScreen/styles.js
index 351536b..15c764c 100644
--- a/js/scenes/NumberOfGuestScreen/styles.js
+++ b/js/scenes/NumberOfGuestScreen/styles.js
@@ -51,11 +51,7 @@ export default StyleSheet.create({
   buttonContainer: {
     flex: 0,
     flexDirection: 'row',
-<<<<<<< HEAD
-    flexWrap: 'wrap'
-=======
     flexWrap: 'wrap',
->>>>>>> Added Button to Guest Number Screen.
   },
   button: {
     flex: 0,