Fix merge conflict on test