Restore files which are overrided，
Everyone should be much more careful
while meeting version conflicts!
especially when you not familiar enough with egit usage.