remove unused files
stast admin services
changes in view
resolve conflict