fix conflict in welcome page