[+] Adding sample files
[*] Merged conflict