Solve application/set conflict