revert use symbolic link
merge branch master