Angelina Jolie wants Brad Pitt to 'end the fighting' by dropping his winery laws