Resolved conflic