Whenever you have a border dispute like this between two countries, the only way to settle it is through compromise. Neither of these countries is likely to go to war with the other over these borders and there is no international body that can make a decision on the issue and actually force either country to comply with that decision. Therefore, there has to be the political will in both countries to solve the dispute.
Since there are multiple spots that are in dispute, one path to an agreement might be through a swap. It could be that the two countries would decide to each take one of the disputed areas. It could be that the countries could include other things in a compromise. One side could offer better economic ties to the other, for example.
One way or another, the only way for this dispute to be settled is by both sides managing to come to a compromise.