German Chancellor Angela Merkel to fight another day after settling migration row