Fixed Conflicts:
	sw/simulator/nps/nps_ivy.c