Fix a merge conflict in the appdata file

Authored by ltoscano on Jun 1 2020, 7:44 AM.