adding static folder
conflict res