fix broken conflict fix, oops i kept the wrong code