Added static files
Resolved Conflict