diff --git a/serverless.yml b/serverless.yml
index 405c89c..4be9230 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -115,7 +115,6 @@ functions:
           cors: true
           authorizer: aws_iam
 
-<<<<<<< HEAD
   billing:
     handler: billing.main
     events: