fixed merge conflicts
fixed merge conflicts
added dist build