fix conflict mainview