Update Clock.txt

diff --git a/Clock.txt b/Clock.txt
index 60bbe0a..959e450 100644
--- a/Clock.txt
+++ b/Clock.txt
@@ -12,19 +12,12 @@
 ##            Manifest           ##
 ###################################

-<<<<<<< HEAD
-## Title: Clock |cFFA4000.7.2|r - |ccc0000neoView|r
-## Description: Adds a fully customizable notice about time and date in Tamriel and Earth.
-## Author: |c0080ffTyx|r
-## Version 0.7.2
-## APIVersion: 100014
-=======
-## Title: Clock |cFFA4000.7.2|r
+## Title: Clock |cFFA4000.7.3|r - |ccc0000neoView|r
 ## Description: Adds a fully customizable notice about time and date in Tamriel and Earth.
 ## Author: |c0080ffTyx|r
 ## Version 0.7.3
 ## APIVersion: 100015
->>>>>>> refs/remotes/origin/master
+
 ## SavedVariables: Clock_Settings
 ## OptionalDependsOn: LibAddonMenu-2.0