you could merge it as is and add an issue about the gotcha with external batteries