# Report Week 0 (31.05 - 06.06)

**URL:** https://discourse.joplinapp.org/t/report-week-0-31-05-06-06/17865
**Category:** Conflict Resolution
**Created:** [8 June 2021 15:28 UTC](https://discourse.joplinapp.org/t/report-week-0-31-05-06-06/17865 "2021-06-08T15:28:32Z")
**Posts on this page:** 1
**Page:** 1

<div class="post-metadata">

### Author: ![Ahmad45123](https://yyz2.discourse-cdn.com/flex028/user_avatar/discourse.joplinapp.org/ahmad45123/32/7714_2.png) [@Ahmad45123](https://discourse.joplinapp.org/u/Ahmad45123)
#### Post date: [8 June 2021 15:28 UTC](https://discourse.joplinapp.org/t/report-week-0-31-05-06-06/17865/1 "2021-06-08T15:28:33Z")

</div>

_(I started a week earlier then most projects, though I didn't do much)_

## Goals Achieved

- Created PR to add the column `conflict_parent_id`.
- Added base plugin code and planned how the UI will work, most likely the plan will be to replace the editor view when opening a Conflict note.

## Problems

- None atm

## Goals for the upcoming week

- Finish the requested changes in the PR and get it merged.
- Work on UI as a proof of concept and post it on the forums for feedback.