Correct indentation
Fix merchant edit (not just join)