Add simple conflict spec