diff --git a/.reviewboardrc b/.reviewboardrc
index a989cb2..dc119ba 100644
--- a/.reviewboardrc
+++ b/.reviewboardrc
@@ -19,4 +19,4 @@
 REPOSITORY = 'samza-hello-samza'
 GUESS_DESCRIPTION = True
 TARGET_GROUPS = 'samza'
-TRACKING_BRANCH = 'origin/latest'
+TRACKING_BRANCH = 'origin/master'
diff --git a/bin/deploy.sh b/bin/deploy.sh
index 139c788..167333e 100755
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@ -23,4 +23,8 @@
 
 mvn clean package
 mkdir -p $base_dir/deploy/samza
+<<<<<<< HEAD
+tar -xvf $base_dir/target/hello-samza-1.5.0-dist.tar.gz -C $base_dir/deploy/samza
+=======
 tar -xvf $base_dir/target/hello-samza-1.5.0-SNAPSHOT-dist.tar.gz -C $base_dir/deploy/samza
+>>>>>>> origin/latest
diff --git a/gradle.properties b/gradle.properties
index ed6b46b..6435c33 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-SAMZA_VERSION=1.6.0-SNAPSHOT
+SAMZA_VERSION=1.6.0
 KAFKA_VERSION=0.11.0.2
 HADOOP_VERSION=2.7.1
 
diff --git a/pom.xml b/pom.xml
index f7a0d27..d7d83ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>org.apache.samza</groupId>
   <artifactId>hello-samza</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.6.0</version>
   <packaging>jar</packaging>
   <name>Samza Example</name>
   <description>
@@ -294,7 +294,7 @@
   <properties>
     <!-- maven specific properties -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <samza.version>1.6.0-SNAPSHOT</samza.version>
+    <samza.version>1.6.0</samza.version>
     <hadoop.version>2.6.1</hadoop.version>
   </properties>