Germany's SPD averts clash over military service at party conference