Removed leftover merge comment. Fixes #18