prepare dir
solve merge conflicts of excluding files