Tile Conflict Resolved (4-29-2021)