Update ui to fix merge conflict