Merge with home version