Manually re-order stories in the list (story id: 10)
merge fix (story id: 10)