[Android/ToDo offline] Change conflict resolution policy