updated the doc to aa
resolve conflict