ordering of ors and ands

bookshare/trades/templates/detail_listing.html

@@ -292,7 +292,7 @@ SRCT Bookshare • {{ listing.title }}
             </div>
 
             <div class="col-md-2 col-sm-6 col-xs-6 text-center">
-            {% if not listing.exchanged or not listing.cancelled and bid.bidder.user == request.user %}
+            {% if request.user == bid.bidder.user and not listing.exchanged or not listing.cancelled %}
               <h4><a href="{% url 'edit_bid' listing.slug bid.slug %}"<span class="label label-default">Edit</span></a></h4>
             {% endif %}
             {% if bid == listing.winning_bid %}