ModifyConflictTest.java:
Inlined the testModify() method that does not take a Modification parameter.
In the remaining testModify() method, moved the Modification parameter to be the last parameter.
In buildMod(), removed a condition that became unnecessary after modifying the method calls to not pass down null.
Transformed multi-line comments into one line comments where it fits.