snapshot and merge aliases
patience for diff