German Social and Christian Democrats agree on new government