[Mingha] Fixing merging issues