Merge all the difference
Update UserDaoImpl.java