removed conflicts on welcome html