Formated the code. Corected missing bracket.
Rename code to code.java
Corrected errors.
Solved conflicts after merge