The question is to find the general solution for the first line of the following picture:

My method is included in that to but it differs from the book answer. One of the biggest problems is that I have two answers and they only have one!

I figured that the second solution must be included in the first, but for my solutions this doesn't happen.

Can anyone point out what i'm doing wrong?