directory structure fixed
conflict merge