pull request: @sjarvie -- remove conflict

@sjarvie -- remove conflict