resolved confict