fix merge

Author: taylorludwig

CHANGELOG.md

@@ -92,12 +92,9 @@ Extending the adopted spec, each change should have a link to its corresponding
 [0.2.0]: https://github.com/terraform-google-modules/terraform-google-container-vm/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/terraform-google-modules/terraform-google-container-vm/compare/v0.1.0...v0.1.1
 
-<<<<<<< HEAD
 [#55]: https://github.com/terraform-google-modules/terraform-google-container-vm/pull/55
-=======
 [#57]: https://github.com/terraform-google-modules/terraform-google-container-vm/pull/57
 [#54]: https://github.com/terraform-google-modules/terraform-google-container-vm/pull/54
->>>>>>> master
 [#48]: https://github.com/terraform-google-modules/terraform-google-container-vm/pull/48
 [#46]: https://github.com/terraform-google-modules/terraform-google-container-vm/pull/46
 [#41]: https://github.com/terraform-google-modules/terraform-google-container-vm/pull/41