Added word Michael to list view
bad commit, didn't resolve conflict