Fix merge issues with docs

These files were accidentally merged badly when we merged with the v1
branch. This commit brings the contents of these files back in line with
the v1 branch.

CONTRIBUTING.md

@@ -6,21 +6,10 @@ We’d love to accept your patches and contributions to this project. Please rev
 
 All contributors to this project must have a signed Contributor License Agreement (**"CLA"**) on file with us. The CLA grants us the permissions we need to use and redistribute your contributions as part of the project; you or your employer retain the copyright to your contribution. Head over to https://cla.pivotal.io/ to see your current agreement(s) on file or to sign a new one.
 
-<<<<<<< HEAD
 We generally only need you (or your employer) to sign our CLA once and once signed, you should be able to submit contributions to any Pivotal project.
 
 Note: if you would like to submit an "_obvious fix_" for something like a typo, formatting issue or spelling mistake, you may not need to sign the CLA. Please see our information on [obvious fixes](https://cla.pivotal.io/about#obvious-fix) for more details.
-=======
-We generally only need you (or your employer) to sign our CLA once and once signed, you should be able to submit contributions to any Pivotal project. 
-
-Note: if you would like to submit an "_obvious fix_" for something like a typo, formatting issue or spelling mistake, you may not need to sign the CLA. Please see our information on [obvious fixes](https://cla.pivotal.io/about#obvious-fix) for more details. 
->>>>>>> 584461ffd7025330e12c89dd85f2ae2c33e95de4
 
 ## Code reviews
 
 All submissions, including submissions by project members, require review and we use GitHub's pull requests for this purpose. Please consult [GitHub Help](https://help.github.com/articles/about-pull-requests/) if you need more information about using pull requests.
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 584461ffd7025330e12c89dd85f2ae2c33e95de4

NOTICE

@@ -1,21 +1,10 @@
 Pairist
 
-<<<<<<< HEAD
 Copyright (c) 2018-Present Pivotal Software, Inc. All Rights Reserved.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
 You may not use this product except in compliance with the License.
 
 This product may include a number of subcomponents with separate copyright notices
 and license terms. Your use of these subcomponents is subject to the terms and
-conditions of the subcomponent's license, as noted in the LICENSE file.
-=======
-Copyright (c) 2018-Present Pivotal Software, Inc. All Rights Reserved. 
-
-This product is licensed to you under the Apache License, Version 2.0 (the "License").  
-You may not use this product except in compliance with the License.  
-
-This product may include a number of subcomponents with separate copyright notices 
-and license terms. Your use of these subcomponents is subject to the terms and 
-conditions of the subcomponent's license, as noted in the LICENSE file. 
->>>>>>> 584461ffd7025330e12c89dd85f2ae2c33e95de4
+conditions of the subcomponent's license, as noted in the LICENSE file.