Merge in lollipop