Add files for the fourth TDP
Fix conflict