tests/Makefile: Fix merge conflict