add ui template
resolve conflict