Merging in TJs files