error: The following untracked working tree files would be overwritten by merge:
	AmberTools/src/amberlite/ffgbsa.c
	AmberTools/src/amberlite/mdnab.c
	AmberTools/src/amberlite/minab.c
	AmberTools/src/config.h
	AmberTools/src/fftw-3.3/Makefile
	AmberTools/src/fftw-3.3/api/.deps/apiplan.Plo
	AmberTools/src/fftw-3.3/api/.deps/configure.Plo
	AmberTools/src/fftw-3.3/api/.deps/execute-dft-c2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/execute-dft-r2c.Plo
	AmberTools/src/fftw-3.3/api/.deps/execute-dft.Plo
	AmberTools/src/fftw-3.3/api/.deps/execute-r2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/execute-split-dft-c2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/execute-split-dft-r2c.Plo
	AmberTools/src/fftw-3.3/api/.deps/execute-split-dft.Plo
	AmberTools/src/fftw-3.3/api/.deps/execute.Plo
	AmberTools/src/fftw-3.3/api/.deps/export-wisdom-to-file.Plo
	AmberTools/src/fftw-3.3/api/.deps/export-wisdom-to-string.Plo
	AmberTools/src/fftw-3.3/api/.deps/export-wisdom.Plo
	AmberTools/src/fftw-3.3/api/.deps/f77api.Plo
	AmberTools/src/fftw-3.3/api/.deps/flops.Plo
	AmberTools/src/fftw-3.3/api/.deps/forget-wisdom.Plo
	AmberTools/src/fftw-3.3/api/.deps/import-system-wisdom.Plo
	AmberTools/src/fftw-3.3/api/.deps/import-wisdom-from-file.Plo
	AmberTools/src/fftw-3.3/api/.deps/import-wisdom-from-string.Plo
	AmberTools/src/fftw-3.3/api/.deps/import-wisdom.Plo
	AmberTools/src/fftw-3.3/api/.deps/malloc.Plo
	AmberTools/src/fftw-3.3/api/.deps/map-r2r-kind.Plo
	AmberTools/src/fftw-3.3/api/.deps/mapflags.Plo
	AmberTools/src/fftw-3.3/api/.deps/mkprinter-file.Plo
	AmberTools/src/fftw-3.3/api/.deps/mktensor-iodims.Plo
	AmberTools/src/fftw-3.3/api/.deps/mktensor-iodims64.Plo
	AmberTools/src/fftw-3.3/api/.deps/mktensor-rowmajor.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-1d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-2d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-3d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-c2r-1d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-c2r-2d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-c2r-3d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-c2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-r2c-1d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-r2c-2d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-r2c-3d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft-r2c.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-dft.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru-dft-c2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru-dft-r2c.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru-dft.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru-r2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru-split-dft-c2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru-split-dft-r2c.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru-split-dft.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru64-dft-c2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru64-dft-r2c.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru64-dft.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru64-r2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru64-split-dft-c2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru64-split-dft-r2c.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-guru64-split-dft.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-many-dft-c2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-many-dft-r2c.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-many-dft.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-many-r2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-r2r-1d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-r2r-2d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-r2r-3d.Plo
	AmberTools/src/fftw-3.3/api/.deps/plan-r2r.Plo
	AmberTools/src/fftw-3.3/api/.deps/print-plan.Plo
	AmberTools/src/fftw-3.3/api/.deps/rdft2-pad.Plo
	AmberTools/src/fftw-3.3/api/.deps/the-planner.Plo
	AmberTools/src/fftw-3.3/api/.deps/version.Plo
	AmberTools/src/fftw-3.3/api/Makefile
	AmberTools/src/fftw-3.3/api/fftw3.f03
	AmberTools/src/fftw-3.3/config.h
	AmberTools/src/fftw-3.3/config.log
	AmberTools/src/fftw-3.3/config.status
	AmberTools/src/fftw-3.3/dft/.deps/bluestein.Plo
	AmberTools/src/fftw-3.3/dft/.deps/buffered.Plo
	AmberTools/src/fftw-3.3/dft/.deps
Aborting