Updated to current source and remove conflict in Text.cpp