Changed shipping to say FREE rather than 0
missing <tr> tag
fixed merge conflict