Update and rename src/L22d/Lab22d.java to src/merge/MergeTest.java