Manually resolve merge conflicts in Makefile and skimage.tex

Conflicts:
	Makefile
	latex/skimage.tex