Some changes in the Wild X
CS
- Fix conflict