Automerge with nightbeat
Unbreak merge...
Merge branch 'master' of github.com:edthedev/dotfiles
Yay merge...

Conflicts:
	i3/config
	vimrc