Add By Dong Master & Java Conflict Test