diff --git a/src/source.cpp b/src/source.cpp
index cf584e12ea..99ec3a74d1 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -503,12 +503,6 @@ SourceSite MCPLFileSource::read_single_particle() const
   return omc_particle_;
 }
 #endif //OPENMC_MCPL
-=======
->>>>>>> 380cfc150b449ef56debb5261caa010a52c42bdd
-=======
-#endif
->>>>>>> 71568d4f4 (refactor MCPL file read part of FileSource)
->>>>>>> 55f2be19e (refactor MCPL file read part of FileSource)
 
 //==============================================================================
 // Non-member functions
diff --git a/src/state_point.cpp b/src/state_point.cpp
index 14a5411283..1b133a1215 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -643,6 +643,7 @@ void write_mcpl_source_point(const char *filename, bool surf_source_bank)
 }
 #endif
 
+
 void write_source_bank(hid_t group_id, bool surf_source_bank)
 {
   hid_t banktype = h5banktype();