Fixes merge conflict in segment docs, adds missing build files