init of morning's portofolio
merged conflict