Trung added file effects
Fix conflict