merge with changes still resided on local dev branch