Finally a true solution to the conflict