Updated bridge to cache parsed files and continued work on refresh/conflicts.
Finishing up new add/results/conflict detection.
Visual error dialogs. Conflict algorithm finished, now need to display conflict results and allow user to handle.