anchor.diff:  
   						int count = d_pstmt.executeUpdate();
   
  -<<<<<<< HEAD
  -		// Use the created statement to SELECT
  -		// the student attributes FROM the Student table.
  -		String sql = "SELECT * FROM products_categories INNER JOIN products ON (products_categories.category_id=?) WHERE products_categories.product_id=products.product_id";
  -		pstmt = conn.prepareStatement(sql);
  -		pstmt.setInt(1, category_id);
  -		rs = pstmt.executeQuery();
  -		System.out.println("hello");
  -=======
   						if(count != 0){
   							%>
   							<t:message type="success" message="Product successfully updated"></t:message>
  
positive.code: 	
  	
  	
  >>>>>>> FETCH_HEAD
  %>
  
  
  
negative.code: 		<!-- products -->
  		<div class="col-sm-10">
  			<%
  
  			if(!cid.equals("null"))
  			{
  