huh, conflicts!!

why is git still using nano
Merge remote-tracking branch 'origin/master'

Conflicts:
	mergeconflict

i totally did a bunch of merge conflicts

also i set the default commit editor to vim so yey