fixed equation
merged