Merge with main version