Initial Commit - UI mockup
conflict resolution