Removed unuser cache and log files from repository
Merge conflicts