cleanup leftover from merge conflict
Merge pull request #40 from MartinNowak/cleanupMergeConflict

cleanup leftover from merge conflict