add "(expected)" to conflict message to avoid confusion.
add "(expected)" to conflict message to avoid confusion.

MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame