practice merge with minor scss change