fixed conflict with makefile