Angela Merkel makes gains, history in German elections