fixed dplyr conflicts most efficiently
closes OHI-Science/issues#119