Merge conflict + UI issue