Merge conflicts were not resolved in UI files