[Tails-dev] Automatically resolving merge conflicts in confi…

FíoAutorData ()
Mintrigeri