updated merge conflict
removed egg files
removed dist and build files