Fix changelog conflict to 1.0.6
Fix changelog conflict to 1.0.6

AdamSlater/stock-ticker,TheMysteriousTomato/stock-ticker,jDeluz/stock-ticker,jDeluz/stock-ticker,TheMysteriousTomato/stock-ticker,AdamSlater/stock-ticker,jDeluz/stock-ticker,khoanguyen96/stock-ticker,AdamSlater/stock-ticker,TheMysteriousTomato/stock-ticker,khoanguyen96/stock-ticker,khoanguyen96/stock-ticker