showdown style tweaking
conflict resolution