Removed redundant AdapterVersion
Fixed merging issues