Use prompt asking user to resolve a conflict. Use --non-interactive to disable interactive mode.