Uploading make tea solution
solving merge conflicts removing problem.java inside tea