change welcome html for outline
remove conflicts