fix peace letter bugs
merge