End of tutorial part 5.
fixed merge issue.