Fix merge issue
Update documentaiton