fix conflict and add loading message