Fix script loosing the actual merge line after the recent changes moved things around