pallet town add
fix merge