Added "Fix contracts", "Fix PlNum", staff merging is now optional