fix conflict

Signed-off-by: Manohar Vanga <mvanga@mpi-sws.org>