Still tweaking demo
Added merge conflict but it is getting sloppy
Still no luck with merge conflict