Remove rebase error in Changelog

Author: aaron-lane

CHANGELOG.md

@@ -118,12 +118,9 @@ Extending the adopted spec, each change should have a link to its corresponding
 [#50]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/50
 [#49]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/49
 [#46]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/46
-<<<<<<< HEAD
 [#43]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/43
 [#42]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/42
-=======
 [#40]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/40
->>>>>>> update changelog
 [#38]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/38
 [#33]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/33
 [#31]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/31