Since we are monitoring remote data now, we should define how we deal with conflicts when one is detected in an automated pull.