add dataone to Merritt submission
resolved conflict
resolved conflict