Add failing merge cases, and fix now visible bug
Merge pull request #144 from lanfeust69/master

Add failing merge cases, and fix now visible bug