layout update
fix conflict