local changes in AND
merge
init support