refactor and setup version for data merge