Fix merge eating some characters
Add a test checking the pervious failure