current version
merged