Merge amazeui