adding framework for site membership
merge tool changes