Features create and show answer and question were added.
Acceptance-test for show question was passed(green).
Resolving conflicts.