fix bug by saying mistakes
resolve merging conflict
added insult toward the user, completed code