Add 'merge' as an alias for 'rename' (since it also has that effect) and tidy up the usage text