removing merge conflicts + reverting back to core initialization