merged
fixed issue with dist directory not being ready