Updated framework to solve conflict