Conflicting test

Some lines changed. :astonished: :lollipop: