FileCache
resolve conflicts