merge lollipop change