Remove git conflict markers in JVMCapacityStrategyTest license header.