Resolving Conflicts, Version  0.0.1