Reinitialize
merge conflict