Significant changes after working through diffs on a project
Started implementing new conflict resolution interface