create / edit site
solve conflict