I was having problem during conflict resolving as seen on my last diary. But it checked out that it was due to the fact that I was using the version that was not tested but it's now solved.

Rojnivîska Alazar-AddisMap
Nivîsên rojane yên dawîn
Error During Conflict Resolving
Ji alî Alazar-AddisMap ve di 27 October 2009 de bi English hatiye nivîsîn.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?
FAQ
Ji alî Alazar-AddisMap ve di 10 October 2009 de bi English hatiye nivîsîn. Cara dawiyê di 15 October 2009 de hatiye nûkirin.I started mapping three months ago and I am getting used to it. It's fun and I hope everybody's feeling the same too. By the way, I helped translate the English OSM FAQ for the new site - www.OpenStreetMap.org.et and believe that everyone can understand it.
I have uploaded most of the confusion square features and tracks as best as I could. I also tried to categorize most of the tracks in accordance with the categories used in our country, Ethiopia.