Conflict file was removed
Conflict file was removed
Add UserDao missed interface.