first pass at web UI for resolving merge conflicts