Resolved confict