deleted log files
Removed conflicts