I don't think diplomatic solutions are possible when one side says "this land that we don't currently occupy is ours", especially when the people in charge view admitting they were mistaking as a existential personal failure. The best you can hope for is balance-of-power detente.