add the body the index
resolve conflict