fix the upper money
fix conflict