Bugfix for #74 and #75. Duplicate lines were created while merging