Commit b794cbcdb638676e593cc8d2ff3394ae21f2a185

Russell Belfer 2014-01-30T11:38:25

Rename conflict to collision to prevent confusion