debug
merged
refactored some dialogue