add another conflict factor
Merge remote-tracking branch 'origin/master'

Conflicts:
	java/src/WriteAndThrow.java

Conflicts:
	java/src/WriteAndThrow.java