Fix merge eating some characters