Merge "[Player] Modified to detach sources when the resource conflict occurs." into...