fix merge
merge fast forward fix
get boiler plate code working