Update show conflicts

[BJ Freeman]

showing conflicts for startofbiz.sh and .bat
any idea how to resolve this?