Attempt to force a conflict
creating a conflict
Attempt 2 at conflict. First attempt postponed due to rebasing of branches
not a very helpful description of an update
conflict resolved :)