merge UI changes