tighten up code, remove copy/paste bits
Make move() report merged cells. Update comments.