rename dist
solved conflict
DB