integration testing makefile changes
resolve merge conflict