resolved conflicts for main to develop pull#366

RutvikGhaskataEalf merged 1 commit intodevelopAElfProject/aelf-docs:developfrom

feature/pull-main-branchAElfProject/aelf-docs:feature/pull-main-branchCopy head branch name to clipboard