#124: fix conflict problem