a bit of changes in EUser.java and Util.java
merge error solved