fix conflict in welcomepage controller