Simplify (3x-1)+(x^2+5x-4)