deleted local copy of conflicting database