Remove the git conflict messages accidentally checked into the email templates