fix merge conflics with datawalk