diff --git a/README.md b/README.md
index b3875876..26adb303 100644
--- a/README.md
+++ b/README.md
@@ -606,6 +606,25 @@ Rebooting currently running image:
 xsc_boot_copy -r
 ```
 
+### Setting time on Q7S
+Setting date and time (only timezone UTC available)
+````
+timedatectl set-time 'YYYY-MM-DD HH:MM:SS'
+````
+Setting UNIX time
+````
+date +%s -s @1626337522
+````
+This only sets the system time and does not updating the time of the real time clock. To harmonize
+the system time with the real time clock run
+````
+hwclock -w
+````
+Reading the real time clock
+````
+hwclock --show
+````
+
 ## pa3tool Host Tool
 
 The `pa3tool` is a host tool to interface with the ProASIC3 on the Q7S board. It was
@@ -793,35 +812,8 @@ git remote update --prune
 
 After that, an update can be merged by running
 
-<<<<<<< HEAD
-## Useful Q7S Linux Commands
-Rebooting currently running image:
-````
-xsc_boot_copy -r
-````
-
-## Setting time on Q7S
-Setting date and time (only timezone UTC available)
-````
-timedatectl set-time 'YYYY-MM-DD HH:MM:SS'
-````
-Setting UNIX time
-````
-date +%s -s @1626337522
-````
-This only sets the system time and does not updating the time of the real time clock. To harmonize
-the system time with the real time clock run
-````
-hwclock -w
-````
-Reading the real time clock
-````
-hwclock --show
-````
-=======
 ```sh 
 git merge upstream/master
 ```
 
 Alternatively, changes from other upstreams (forks) and branches can be merged like that in the same way.
->>>>>>> develop