updated index master
resolve megre conflict