Update TestProject.java

Testing merges