diff --git a/shared/containers/SignupView/SignupView.jsx b/shared/containers/SignupView/SignupView.jsx
index e1f92f90..8467ee92 100644
--- a/shared/containers/SignupView/SignupView.jsx
+++ b/shared/containers/SignupView/SignupView.jsx
@@ -1,4 +1,5 @@
 import React from 'react'
+<<<<<<< HEAD
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import * as UserActions from '../../redux/actions/user'