merge mode
Merge pull request #23 from masarakki/add-merge-mode

merge mode