Small changes
Solving merge
Deleted logs file
Small changes