Remove merge conflict

Should do the trick. I believe this is the expected behavior with the `$this->condition` still in place?