58 no merge marks

Fixes #58