Deleted some conflicting files