Deleted some unnecessary files from the repository
Resolved conflict