merge fixed, re adding make