Germany's Merkel: Don't give up on 2-state solution