Delete not use code folder
conflict merge