modified index added members
modified 3 files
resolve conflict