[FIX] merge with versioning