merge new_folder from master branch