Palace Placement things
Merge Conflict