linux update
fix conflict