removed -lapacke in Makefile and fixed merge conflict in CreateDatabase.c