Sorry, this is the right file, the other one was just notes. Now merging User.java class