fixed output writing
refactored usage of UriMapping
connect odcsft-application to the new conflict resolution, disable --conflicts-only option