Remove conflict marker (whoops!)
Fix broken tests due to all_lines change
Add currency property to pricing policies
Pass the request to the shipping repository

Sometimes you need to use the session to determine the availability
shipping methods.