re koukou'
fix conflict