[*] App: Conflict resolving