Simple conflict detection test & refractor the diff tests a little