Add merge functionality.
Merge pull request #12 from Gizra/5

Add merge functionality.

- zariz_merge_branch() -- Merge the content of a snapshot into another branch.
- zariz_get_merge_conflicts() -- Get entities that have a merge conflict.