diff --git a/place-order.html b/place-order.html
index aafb033..c679d43 100644
--- a/place-order.html
+++ b/place-order.html
@@ -215,13 +215,9 @@ <h3 class="add">ShippingAddress</h3>
 									<p><label>E-mail:</label><span>123456789</span></p>
 									<p><label>Address:</label><span>xinduhui Los Angeles 20010 California United States</span></p>
 									<p><label>ZIP/Postal Code:</label><span>20010</span>
-<<<<<<< HEAD
-									<a href="data-placeOrderForm.html" class="edit J_edit">Edit<i class="iconfont icon-xiugai"></i></a></p>
-								</div>						
-=======
+
 									<a href="data-placeOrderForm.html" class="edit J_edit" ><i class="iconfont icon-xiugai"></i>Edit</a></p>
 								</label>						
->>>>>>> origin/master
 							</div>
 							<div class="contentd clearfix">
 								<input type="radio" name="biling_address_id"  checked="true" id="address_2" />
diff --git a/src/js/place-order.js b/src/js/place-order.js
index 2a22d55..3a705ed 100644
--- a/src/js/place-order.js
+++ b/src/js/place-order.js
@@ -29,21 +29,12 @@ $(function(){
 	$('.address_list').delegate('.J_edit','click',function(){
 		showForm(this);
 		return false;
-<<<<<<< HEAD
-=======
-		
->>>>>>> origin/master
 	});
 
 	//save address
 	$('.J_inner').delegate('button','click',function(e){
-<<<<<<< HEAD
 		saveAdress(this);
 	});
-=======
-		saveAdress(this);	
-	})
->>>>>>> origin/master
 
 	//change country on shipping address 
 	$('.J_country').on('change',function(){
@@ -103,10 +94,6 @@ $(function(){
 					dataType: "json",
 					success: function(data){
 						dimmer.hideDown();
-<<<<<<< HEAD
-						$('.address_list').find('.J_newaddress').before(data.html);	
-						updateOrder();				
-=======
 
 						if ( index == -1 ){
 							$('.address_list').find('.J_newaddress').before(data.html);
@@ -114,7 +101,6 @@ $(function(){
 							var li = $('.address_list').children("div").eq(index);
 							li.replaceWith(data.html);
 						}
->>>>>>> origin/master
 						popup.hideDown();
 					},
 					error: function(){