merge down changes