Merge From Kai then From Master