add _site
modify
handle conflict