Add Solution3
Resolve conflict Test.java