offer-view
...
Merge-Conflicts solved