Fixed merge error and further uncached build files.