question controller
conflict resolver