fixing merge error
doc update