Resolving merge conflicts with master

docs/tasks/administer-federation/job.md

@@ -16,7 +16,7 @@ parallelism and completions exist across the registered clusters.
 
 * {% include federated-task-tutorial-prereqs.md %}
 * You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/getting-started-guides/) in
+[working knowledge of Kubernetes](/docs/setup/) in
 general and [jobs](/docs/concepts/workloads/controllers/jobs-run-to-completion/) in particular.
 {% endcapture %}
 
@@ -61,7 +61,11 @@ if you have 3 registered clusters and you create a federated job with
 `spec.parallelism = 9` and `spec.completions = 18`, then each job in the 3 clusters has
 `spec.parallelism = 3` and `spec.completions = 6`.
 To modify the number of parallelism and completions in each cluster, you can specify
+<<<<<<< HEAD
 [ReplicaAllocationPreferences](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/federation/apis/federation/types.go)
+=======
+[ReplicaAllocationPreferences](https://github.com/kubernetes/federation/blob/{{page.githubbranch}}/apis/federation/types.go)
+>>>>>>> master
 as an annotation with key `federation.kubernetes.io/job-preferences`
 on the federated job.