The conflict began
Merge branch 'branchB' of github.com:kosmas-formulatrix/lucky-simple into branchB

Conflicts:
	ResolvingConflictBinary.odp