intro to prog sys des

refactored no-conflict? logic