ville is wining
resolved the conflict