re-init
merge commit