Grit Daily conflict resolution