Change conflict action.
Add logo.