if there exits any conflicts between files, please use the one in video reposiroty!!!!!!!