Answered a time and space requirement question.
Fixed merge error.