Upadating files messages
Resolving conflict