fix conflict id