add owner-group for mercurial-env
add ignores
merge conflicts