We encountered a problem when publishing your application, resulting in merge conflicts in some of your files.
A Show Conflicts button shows below the message.
