I am currently using the 2225 version of JOSM but I am having difficulties in uploading as it reports an error and when I try resolving these conflicts the only option I get is deleting the whole track or node/s but even after that the conflict box will not change and my conflict resolving box doesn't seem to function or bring about any change. What should I do?