Re-initialize
Fix merge conflicts