Change Details

Currently the version of the user in need to merge the edits is on the left. In the feedback loop it was claimed confusing as users expect their last version to be on the right. Therefore switch the version of the user currently merging the edit conflict to the right and have it highlighted in blue.

**Motivation** Currently the version of the user in need to merge the edits is on the left. In the feedback loop it was claimed confusing as users expect their last version to be on the right. **Task** [] Switch the version of the user currently merging the edit conflict to the right [] The colors stay the same (i.e. yellow on the left, blue on the right)

**Motivation** Currently the version of the user in need to merge the edits is on the left. In the feedback loop it was claimed confusing as users expect their last version to be on the right. **Task** [] Switch the version of the user currently merging the edit conflict to the right [] The colors stay the same (i.e. yellow on the left, Therefore switch the version of the user currently merging the edit conflict toblue on the right and have it highlighted in blue.)