Fix merge with a normal topic

We were applying the same policy on normal topics than on crossrepo
topics.