left behind after conflict resolving