merge ui modifications