people show
merge people show
fix
Merge branch 'feature/people_show' into feature/people_edit
some step