nothing
nothing
after conflict
selectingChallenge finished & merged