Merge Zivi Master