fix merged test
dev green