Initialized
merge conflict