Fix merge conflicts for cloudwatch.