fix conflict, fix code