modified after merged