On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   world/map/npc/001-1/alec.txt
#	new file:   world/map/npc/001-1/alec.txt~
#	modified:   world/map/npc/009-1/aldan.txt
#	new file:   world/map/npc/009-1/aldan.txt~
#	modified:   world/map/npc/functions/paperboy.txt
#	new file:   world/map/npc/functions/paperboy.txt~
#
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	deleted:    world/map/npc/001-1/alec.txt~
#	deleted:    world/map/npc/009-1/aldan.txt~
#	deleted:    world/map/npc/functions/paperboy.txt~
#