conflict test
fix conflict on first list