update formula
fix merge conflict