Merge conflicts are showing in the webapp