missed some merge characters