Retrieving 'bzr+ssh://bazaar.launchpad.net/~3v1n0/unity/spread-title-improved' to put at 'work'.
Merging 'lp:unity' in to 'work'.
Warning: criss-cross merge encountered. See bzr help criss-cross.
Text conflict in plugins/unityshell/src/unityshell.cpp
1 conflicts encountered.
bzr: ERROR: Conflicts from merge
There is a conflict:
Retrieving 'bzr+ssh: //bazaar. launchpad. net/~3v1n0/ unity/spread- title-improved' to put at 'work'. unityshell/ src/unityshell. cpp
Merging 'lp:unity' in to 'work'.
Warning: criss-cross merge encountered. See bzr help criss-cross.
Text conflict in plugins/
1 conflicts encountered.
bzr: ERROR: Conflicts from merge