diff --git a/README.md b/README.md
index fd31e38..227eff8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,12 @@
 PowerStager: This script creates an executable stager that downloads a selected powershell payload.
 ===================================================================================================
 
+Sneak Peek
+----------
+An update to PowerStager is on it's way. Here is a short sneak peek:
+
+[![powerstager sneak peek](https://d1ckdm8qo2u5d0.cloudfront.net/ai/videos/15651711/thumb-160x.jpg?v2r1495997991)](https://vid.me/A2N7 "powerstager sneak peek - Click to Watch!")
+
 Contact
 -------
 * Author: z0noxz
diff --git a/powerstager/powerstager.py b/powerstager/powerstager.py
index 11f05b8..cc845eb 100755
--- a/powerstager/powerstager.py
+++ b/powerstager/powerstager.py
@@ -955,6 +955,7 @@ class Framework(object):
 
 	def __init__(self, send_delegate, check_delegate, receive_delegate):
 
+<<<<<<< HEAD
 		# Set delegates
 		self.send_delegate = send_delegate
 		self.check_delegate = check_delegate
@@ -964,6 +965,16 @@ class Framework(object):
 		for fnc in self.framework:
 			self.framework[fnc]["name"] = Utility.dynamic_variable()
 			self.framework[fnc]["function"] = "function " + self.framework[fnc]["name"] + self.framework[fnc]["function"]
+=======
+# Integer to binary converter
+def binarray(n):
+	if (n == 0):
+		yield 0
+	else:
+		while n:
+			yield n & 0xff
+			n = n >> 8
+>>>>>>> 0514d86b005091e3d64fdb3cc216f81ba1200fc0
 
 
 	def Upload(self):