deleted one line from orders.css
 fixed a merge conflict