actually not sure that the problem is
Merge branch 'master' of https://github.com/gsummer/netlib-primer

Conflicts:
	pom.xml
fixed the merge thing