figure out model for conflicted issues