[Android/ToDo offline] Add conflict resolution handler