Removed conflict
Removed conflict
Deleted some hidden files