1. A method for processing conflicts in a first and second file tree comprising: presenting one or more conflicts to a user; presenting more than one unresolved independent conflicts as a single conflict to said user; obtaining input from said user; and handling said one or more conflicts and said single conflict based on said input.