Fix merge conflict in uber view