Removed TankTest.java.orig merge artifact