Removed files
Removed conflict