diff --git a/configure.ac b/configure.ac
index 1459ce3..e70ddfa 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,7 @@
 # RNAblueprint: configure.ac
 
 # initial information about the project
-<<<<<<< HEAD
-AC_INIT([RNAblueprint],[1.2],[s.hammer@univie.ac.at],[RNAblueprint],[http://www.tbi.univie.ac.at/~jango/])
-=======
 AC_INIT([RNAblueprint],[1.2.1],[s.hammer@univie.ac.at],[RNAblueprint],[http://www.tbi.univie.ac.at/~jango/])
->>>>>>> develop
 
 # automake initialisation (mandatory)
 AC_PREREQ([2.59])
diff --git a/lib/RNAblueprint.h b/lib/RNAblueprint.h
index 66669e7..b9dedf5 100644
--- a/lib/RNAblueprint.h
+++ b/lib/RNAblueprint.h
@@ -79,16 +79,8 @@
  * 
  * \section cite_sec How to cite
  * 
-<<<<<<< HEAD
- * Stefan Hammer, Birgit Tschiatschek, Christoph Flamm, Ivo L. Hofacker and Sven Findeiß. Submitted 2016. "Flexible and universal multiple target nucleic acid sequence design" Journal: Pages. doi: DOI.
- *
- * Publication for this software package is in progress.
- * We will update this information as soon as a preprint is available online!
- * 
-=======
  * Stefan Hammer, Birgit Tschiatschek, Christoph Flamm, Ivo L. Hofacker, and Sven Findeiß. “RNAblueprint: Flexible Multiple Target Nucleic Acid Sequence Design.” Bioinformatics, 2017. doi:[10.1093/bioinformatics/btx263](http://dx.doi.org/10.1093/bioinformatics/btx263). 
  *
->>>>>>> develop
  */