My colleagues and I ran into some merge conflicts when working in a serverless application. These types of conflicts are quite common in this type of application as working with Open API and CloudFront templates as multiple developers usually need to update those files in a regular basis. Here is a ...
