Although it was initially controversial for taking a swipe at rival soft drink companies Coke and Pepsi (and then getting “banned”; from the Super Bowl as a result), Scarlett Johansson’s SodaStream ad has been the source of a second, more serious controversy.

When the ad debuted earlier this week, Johansson was an ambassador for Oxfam International, a group sympathetic to the Palestinian cause. SodaStream, however, is an Israeli company with a production facility in the West Bank. Immediately after the ad debuted, Oxfam released a statement saying that, while the group respects the independence of their ambassadors, “Oxfam is opposed to all trade from Israeli settlements, which are illegal under international law.”

Today, Johansson resolved this conflict of interest by ending her relationship with Oxfam.

“Scarlett Johansson has respectfully decided to end her ambassador role with Oxfam after eight years,”; said her publicist in a statement. “She and Oxfam have a fundamental difference of opinion in regards to the boycott, divestment and sanctions movement. She is very proud of her accomplishments and fundraising efforts during her tenure with Oxfam.”;

Earlier in the week, Johansson released a statement to the Huffington Post defending SodaStream, arguing that the soft drink company supports progressive values and is dedicated to the idea of Israelis and Palestinians living peacefully side by side. “SodaStream is a company that is not only committed to the environment but to building a bridge to peace between Israel and Palestine, supporting neighbors working alongside each other, receiving equal pay, equal benefits and equal rights,”; she wrote.