Update src/Emp.java

conflict test2