Change merge to return if actual merge was done

Signed-off-by: Benoît Burnichon <bburnichon@gmail.com>