Fix unmerged file and remove tibetan lib