update UI
merge fix