Changed conflict handling to let user decide how to resolve