diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 01185de96c..79ab08136c 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -2867,8 +2867,8 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 			if( (*s)->IsAutogen() )
 				continue;
 			// If the notedata has content, let it go.
-			if( !(*s)->m_NoteData->IsEmpty() )
-				continue;
+//			if( !(*s)->m_NoteData->IsEmpty() )
+//				continue;
 			// It's hard to say if these steps were saved to disk or not.
 			/*
 			if( !(*s)->GetSavedToDisk() )
diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index 97695fb248..849665a377 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -1567,5 +1567,3 @@ void HandleInputEvents(float fDeltaTime)
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-
->>>>>>> other