Don't let the end of the merge window hold things up unnecessarily.  It's clearly ready to go once ya'll come to an agreement on how it works, so just slot it in as soon as you're done, regardless of dates.