Modify Text.java
modify Text.java
Solved conflict Text.java