* manage conflict (generic way) use toast to show error * fix httpservice after merge conflict, adapt to use new repository
Cédric Michel