clarrify the purpose of the directory
resolve conflic in merge