Almost working
Fixed merge function
Local aliases
Merge remote-tracking branch 'origin/reset_or_keep'

Conflicts:
	git_aliases/git_aliases.plugin.zsh