add init
solver merge conflict