Updates to accomodate other cache files
Resolve conflicts