Right before we merge all files