Jakarta budget dispute subsides after weeks of deadlock