changed some visuals...
removed console outout of conflictData.findAll