[FEATURE] added git-merge shortcut