my imports keep doing this
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/erebus/ModItems.java