merged upstream changed