fix merge + remove hard coded address