create challenge conflicts
merge squashed
weeks and phase and submitted?