Remove merge conflict, closes #1