modified after the first time merge