Will tensions boil over again this summer?