diff --git a/doc/scst_user_spec.sgml b/doc/scst_user_spec.sgml
index 288461d68..75f601928 100644
--- a/doc/scst_user_spec.sgml
+++ b/doc/scst_user_spec.sgml
@@ -10,7 +10,7 @@ SCST user space device handler interface description
 	<name>Vladislav Bolkhovitin</name>
 </author>
 
-<date>Version 3.4.0</date>
+<date>Version 3.2.0</date>
 
 <toc>
 
diff --git a/fcst/fcst.h b/fcst/fcst.h
index e26cddf2e..1ae8b63c6 100644
--- a/fcst/fcst.h
+++ b/fcst/fcst.h
@@ -30,6 +30,7 @@
 #define NEW_LIBFC_API
 #endif
 
+<<<<<<< .working
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) || \
 	defined(CONFIG_SUSE_KERNEL) && \
 	LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index 2ff878f13..eb6c89347 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$Version  = 'SCST Configurator v3.4.0-pre1';
+$Version  = 'SCST Configurator v3.3.0-pre1';
 
 # Configures SCST
 #