add index about dialog
resolve conflict