stuff
pom
fixind conflicts
deleting spike test