fix miss merge