unit test modified after conflict