added tax to total
merged and fixed conflicts