Merge conflicts and UI adjustments