solved_incedents -> solved
Merge branch 'hotfix/solved'