resolve conflicts shortcut