moving to latest commit

it has make fix merged