Incomplete change during previous fixing of conflicts