diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 90ad3ea11..263ad44a0 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,8 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
+<<<<<<< HEAD
  #define REVISION_NR "8521"
+=======
+ #define REVISION_NR "8528"
+>>>>>>> [8528] Implementing implicit target 49, 50. Thanks to qsa.
 #endif // __REVISION_NR_H__