Added error for when concat files dont match
Added check on the cache side
Fixed tab/space issues
Replaced watcher file