Merge dev branch to main branch - Xata